From 2cf4b8ad72712b82401b6c910720b912c0264e41 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 4 Jun 2001 23:53:43 +0000 Subject: [PATCH] handle case where text_view->layout == NULL by assuming its size is 0, 2001-06-04 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_size_request): handle case where text_view->layout == NULL by assuming its size is 0, i.e. same as if we haven't done any reflow. Reported by Hidetoshi Tajima #55448 --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtktextview.c | 14 +++++++++++--- 8 files changed, 60 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4beba06d14..947d83c53b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-06-04 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_size_request): handle case + where text_view->layout == NULL by assuming its size is 0, + i.e. same as if we haven't done any reflow. Reported by + Hidetoshi Tajima #55448 + 2001-06-04 Havoc Pennington * gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4beba06d14..947d83c53b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2001-06-04 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_size_request): handle case + where text_view->layout == NULL by assuming its size is 0, + i.e. same as if we haven't done any reflow. Reported by + Hidetoshi Tajima #55448 + 2001-06-04 Havoc Pennington * gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4beba06d14..947d83c53b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2001-06-04 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_size_request): handle case + where text_view->layout == NULL by assuming its size is 0, + i.e. same as if we haven't done any reflow. Reported by + Hidetoshi Tajima #55448 + 2001-06-04 Havoc Pennington * gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4beba06d14..947d83c53b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2001-06-04 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_size_request): handle case + where text_view->layout == NULL by assuming its size is 0, + i.e. same as if we haven't done any reflow. Reported by + Hidetoshi Tajima #55448 + 2001-06-04 Havoc Pennington * gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4beba06d14..947d83c53b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2001-06-04 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_size_request): handle case + where text_view->layout == NULL by assuming its size is 0, + i.e. same as if we haven't done any reflow. Reported by + Hidetoshi Tajima #55448 + 2001-06-04 Havoc Pennington * gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4beba06d14..947d83c53b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2001-06-04 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_size_request): handle case + where text_view->layout == NULL by assuming its size is 0, + i.e. same as if we haven't done any reflow. Reported by + Hidetoshi Tajima #55448 + 2001-06-04 Havoc Pennington * gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4beba06d14..947d83c53b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2001-06-04 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_size_request): handle case + where text_view->layout == NULL by assuming its size is 0, + i.e. same as if we haven't done any reflow. Reported by + Hidetoshi Tajima #55448 + 2001-06-04 Havoc Pennington * gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6 diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index c8299e9ea3..6ebce8533e 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -2286,9 +2286,17 @@ gtk_text_view_size_request (GtkWidget *widget, focus_edge_width = 0; else focus_edge_width = 1; - - text_view->text_window->requisition.width = text_view->layout->width; - text_view->text_window->requisition.height = text_view->layout->height; + + if (text_view->layout) + { + text_view->text_window->requisition.width = text_view->layout->width; + text_view->text_window->requisition.height = text_view->layout->height; + } + else + { + text_view->text_window->requisition.width = 0; + text_view->text_window->requisition.height = 0; + } requisition->width = text_view->text_window->requisition.width + focus_edge_width * 2; requisition->height = text_view->text_window->requisition.height + focus_edge_width * 2; -- 2.30.2